(defsetf): Accept a lambda for the 2-arg form.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f11907944e2005227fbbefa75dc0d0f1f08fb44..2ad5e7b3ac326be511ed64ba52a1a9cae50d41e7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2008-04-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * emacs-lisp/cl-macs.el (defsetf): Accept a lambda for the 2-arg form.
+
        * vc-bzr.el (vc-bzr-previous-revision, vc-bzr-next-revision): New funs.
 
 2008-04-03  Chong Yidong  <cyd@stupidchicken.com>

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 5fea4f6ea49032c5f50b72d46e5c577d5ea4f7c1..1b3252189345f9c752e75c7ff0017f42d33c416d 100644 (file)
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1619,7 +1619,7 @@ Example:
   (defsetf nth (n x) (v) (list 'setcar (list 'nthcdr n x) v))
 
 \(fn NAME [FUNC | ARGLIST (STORE) BODY...])"
-  (if (listp arg1)
+  (if (and (listp arg1) (consp args))
       (let* ((largs nil) (largsr nil)
             (temps nil) (tempsr nil)
             (restarg nil) (rest-temps nil)